bitkeeper revision 1.1389.1.53 (4283a9ddh938uAD1Jnb_4rll_ioGBw)

Merge Makefile changes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --cc BitKeeper/etc/ignore
index 723303c1ba41ca84da4defefbd22633a47bd7988,f87c654e98bd11c058ca462901ce17038b987b2e..a5583563b1cb5a6ef29be4cd1a065e4718aaae56
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -58,8 -52,7 +58,9 @@@ netbsd-*-tools/
  netbsd-*-xen0/*
  netbsd-*-xenU/*
  netbsd-*.patch
+ patches/*/.makedep
 +patches/ebtables-brnf-5_vs_2.4.25.diff
 +patches/ebtables.diff
  patches/tmp/*
  pristine-*
  ref-*

diff --cc Makefile
Simple merge

diff --cc buildconfigs/Rules.mk
index 11f4009525b8d62af1abceac017400fd271e3ee6,a2c4cc5ecc24223edadf2a87d7c63542dce680bd..1e65484b36c9aa8452dcd511a8c91f566214060f
--- 1/buildconfigs/Rules.mk
--- 2/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@@ -49,24 -50,29 +52,30 @@@ els
  OS_VER = $(NETBSD_VER)
  endif
  
- pristine-%: %.tar.bz2
-       rm -rf tmp-$(@F) $@
-       mkdir -p tmp-$(@F)
-       tar -C tmp-$(@F) -jxf $<
-       mv tmp-$(@F)/* $@
-       touch $@ # update timestamp to avoid rebuild
+ $(patsubst %,pristine-%/.valid-pristine,$(ALLSPARSETREES)) : pristine-%/.valid-pristine: %.tar.bz2
+       rm -rf tmp-pristine-$* $(@D)
+       mkdir -p tmp-pristine-$*
 +      touch $@/.bk_skip
-       @rm -rf tmp-$(@F)
+       tar -C tmp-pristine-$* -jxf $<
+       mv tmp-pristine-$*/* $(@D)
+       @rm -rf tmp-pristine-$*
+       touch $@ # update timestamp to avoid rebuild
+ 
+ PATCHDIRS := $(wildcard patches/*-*)
+ 
+ -include $(patsubst %,%/.makedep,$(PATCHDIRS))
+ 
+ $(patsubst patches/%,patches/%/.makedep,$(PATCHDIRS)): patches/%/.makedep: 
+       @echo 'ref-$*/.valid-ref: $$(wildcard patches/$*/*.patch)' >$@
  
- OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
+ clean::
+       rm -f patches/*/.makedep
  
- ref-%: pristine-% $(OS_PATCHES)
-       rm -rf $@
-       cp -al $< tmp-$(@F)
+ ref-%/.valid-ref: pristine-%/.valid-pristine
+       rm -rf $(@D)
+       cp -al $(<D) $(@D)
        [ -d patches/$* ] && \
-         for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \
-         true
-       mv tmp-$(@F) $@
+         for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done
        touch $@ # update timestamp to avoid rebuild
  
  %-build:
@@@ -78,14 -84,11 +87,14 @@@
  %-clean:
        $(MAKE) -f buildconfigs/mk.$* clean
  
- %-xen.patch: ref-%
 +%-config:
 +      $(MAKE) -f buildconfigs/mk.$* config
 +
+ %-xen.patch: ref-%/.valid-ref
        rm -rf tmp-$@
-       cp -al $< tmp-$@
+       cp -al $(<D) tmp-$@
        ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ ) 
-       diff -Nurp $< tmp-$@ > $@ || true
+       diff -Nurp $(<D) tmp-$@ > $@ || true
        rm -rf tmp-$@
  
  %-mrproper: %-mrproper-extra

diff --cc buildconfigs/mk.linux-2.4-xen0
index e28b3a198189b87320da50d6a3bf3e1456736a08,0a6df660006dcc6977de62e9912de0d0e8bcfb34..6044268d093f2ac01aca76f37bfee1d8fe42769b
--- 1/buildconfigs/mk.linux-2.4-xen0
--- 2/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@@ -45,12 -45,7 +45,12 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
  
- clean:
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
 +
+ clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
  
  delete: 

diff --cc buildconfigs/mk.linux-2.4-xenU
index 9205c26776d291cbd20531d333400f4ba20cc1c6,19808873858d7895d816df7f80b0aaeca674dc4a..4975a988921e4fbc105671a61c86f89b8f414fc7
--- 1/buildconfigs/mk.linux-2.4-xenU
--- 2/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@@ -38,12 -38,7 +38,12 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
  
- clean:
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
 +
+ clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
  
  delete: 

diff --cc buildconfigs/mk.linux-2.6-xen0
index cfba1824b00757d7ece01971a6aee07c4f2842f8,997a2694dd40b1a357942d274b936ddaa40e0ce9..d238a1063021833583b7b25cacbfeb40b57141f4
--- 1/buildconfigs/mk.linux-2.6-xen0
--- 2/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@@ -37,11 -37,7 +37,11 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
  
- clean:
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +
+ clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
  
  delete: 

diff --cc buildconfigs/mk.linux-2.6-xenU
index f2df01f9a7ca878cb274845c5d5565a1acac5fec,1a095ed53d6922f523ab785c06753ac7be2abe91..6101664db1dc06073bd10100690d91dbc87eb9ac
--- 1/buildconfigs/mk.linux-2.6-xenU
--- 2/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@@ -37,11 -37,7 +37,11 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
  
- clean:
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +
+ clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
  
  delete: